From: Simon Josefsson <jas@extundo.com>
Date: Sun, 29 Sep 2002 03:19:35 +0000 (+0000)
Subject: (smtpmail-via-smtp): Only negotiate starttls on
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~30382
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cc644a05e46084d21daa87ec45514cc46e941936;p=emacs.git

(smtpmail-via-smtp): Only negotiate starttls on
streams that were opened using starttls.
---

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 78393348c5d..82fbfdad5ed 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -613,7 +613,7 @@ This is relative to `smtpmail-queue-dir'.")
 	    (if (and do-starttls
 		     (smtpmail-find-credentials smtpmail-starttls-credentials host port)
 		     (member 'starttls supported-extensions)
-		     (process-id process))
+		     (numberp (process-id process)))
 		(progn
 		  (smtpmail-send-command process (format "STARTTLS"))
 		  (if (or (null (car (setq response-code (smtpmail-read-response process))))